fixed failing tests
Merge pull request #158 from j/test-fixes

fixed failing tests
Merge pull request #2 from nelmio/master

pull