Changes to the test suite to allow scenarios to be tested individually