Tidy up tests and commit to force travis to run