old test refactoring