Update all specs to use example@example.com as email
Not sure where to take this next.
polymorphism in the code
Cleanup
Merged