Fixed test (Still horribly fragile)