test and tidy
more tests