Makes the test cleaner / less fragile

Use class fields consistently. Remove apostrophes from email: easier than trying to get encoded strings to match, and still testing what matters. Fixes #1053