All tests are passing now