extend and tidy up tests a bit