Use email instead of display name for tests
Merge branch 'master' of https://github.com/MargeRosen/gear_swap