Fix broken tests
Merge pull request #42 from rubyphunk/master

Fix broken tests