Fixed tests.
Merge pull request #38 from wbyoung/tests

Fixed tests.