tests and filter out FxA people (bug 1059561)
Merge pull request #2594 from andymckay/1059561

tests and filtering