Get the test suite up and working again