Commit events_test to get a baseline to diff against
Merge remote-tracking branch 'origin/master'
Some clean-up in the data source classes