Renamed test files
Removed junk