Renamed a couple of tests