Renamed test files. Fixed failing tests