Further changes to the tests and test utility classes after previously cleaning up some of our test utility code to remove duplication.