Adapt test suite to previous refactoring