Reorganise the tests to be clearer