Working on the unit tests.  Refactored to account for the fact that the Subscription Owner now requires an email address.