fix tests after latest refactoring