working on test refactoring