Tidied up some test cases that were failing because they needed supplementary classes.