Rename unit tests 

Rename unit tests #702