Fixed some unit tests after refactor.