Making Org Testsuite Independent