Renamed a few tests, got metadata tests to fail