Use class fields consistently. Remove apostrophes from email: easier than trying to get encoded strings to match, and still testing what matters. Fixes #1053
Merge pull request #1058 from afred/encoding-in-test-1053

Makes the test cleaner / less fragile