Fixing some tests
Merge pull request #11 from andrewhao/fix-tests

Fixing some tests