Update tests after refactorings.