Renamed tests to use naming convention