My laymans interpretation (may or may not further the debate)...
Test Pilot = Pilot involved in the development of an aircraft.
Pilot doing a flight test = Anything 'test' wise that is post development. i.e. does it work as it normally does? (in previous example: there is no 'normal')