continue to refactor the tests