PR-1537: Further corrections to tests required by the separation of the Objects and Organization views.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@citrix.com>