more tests & tidy