Merge pull request #29 from OpenScienceFramework/issue_29

Stop overriding the handlers in the test cases
Merge branch 'master' into issue_30