Tidy up of test class and some of the assertions.