Some work on the test suite, to allow all the tests to run regardless of success