Renamed tests to my preferred naming convention