Engine: engine-test-org - org model tests

Engine: engine-test-org - partha's fix
Merge pull request #3334 from thomasmckay/engine-test-org

Engine: engine-test-org - org model tests