update tests for refactoring