Renamed tests to contain core in their name