Make all tests work