Organise the tests a little better