Fixed tests.
Fixed tests after refactoring.