Renamed test files
Completed rename of test files