fixing handler tests
Merge pull request #14 from zinic/master

Fix Handler Tests
Merge remote-tracking branch 'upstream/master'