Removed unused file.
Fixed test file names.