update tests before refactoring