Fixed all unit tests after refactor.