Fix tests.
Merge pull request #1105 from normanjaeckel/FixTest

Fix tests.