fixed unit tests failing due to refactoring