Renamed tests and did some reorganizing.