Tidy up this test - still quite bad & useless.