Cleanup and reinstate all tests