Add tests for matching Google email addresses, and fix errors