Renamed tests to match other unit tests convention