a bit of test tidy up, and more coverage