Fixed unit tests after refactor.