Fixed test, tidied.