merge internal changes @ Remind into public blueprint

[phobologic]

This pulls in the event source mapping that we added to our internal blueprint at Remind, as well as cleans up the tests to make them a little easier to write/more consistent.