Fixed failing test after the refactorings.