all tests are passing now