Updated the org tests