refactoring tests to pass