Engine: engine-test-org - org model tests

Engine: engine-test-org - partha's fix