Added data driven test for Org