Took some of the hard grunt work out of the test initialisation.