Fixed false unit test failures due to architectural changes