Updated the org tests so that they conform to new style