new test and tidy up