Organised the tests more consistently