fix tests after refactor