fixed broken tests
Merge pull request #246 from noahsug/master

Fix broken tests