Fix tests
Merge pull request #321 from dlsniper/fix-tests

Fix tests