Add protection so Shibboleth test data is not mistakenly added

Test data will only work when in development. Also added tests to make sure
the method that adds test data is not called.
Fix wrong tests for Event

Wasn't setting some datetimes precisely and the tests were not really testing
what they were meant to.
Merge remote-tracking branch 'upstream/master'