Handle roll back of contact and organization creation.  Some old tests fixed