All tests work now