Fixed test-breaking bug