Further work on #49 updating some of the tests.