Updated to run the standardised tests.