fixed the ddt test failures for Org
fixed the ddt test failures for Org