Wins return as Andreescu finds her joy for tennis again