Making Org Testsuite Independent

Right Now, The tests in the org suite are not independent. i.e Success of one test-case depends on the success of the other. This PR fixes that.