tidy up, more basic tests