I think all tests are working after refactor