made changes to fix old unittests failures brought by new code