Fix tests.
Merge pull request #1 from DrMarcII/fix-tests

Fix tests.