Fix tests.
Merge pull request #18 from ajorians/FixTests

Fix tests.