Renamed and moved all tests closer to top.