fix tests after last refactor