Renamed some tests for clarity