French Open fine tune? Rafael Nadal to make ATP Tour return in Barcelona