fixed broken tests
Merge pull request #33 from cbyn/chris

fixed broken tests