Remove some unnecessary constructs and tidy up the tests a bit