(EmailAggregation) Added some tests, minor cleanup
Merge pull request #5 from mrvisser/emailaggregation

Additional tests and minor cleanup