Fix problems with tests.
Merge pull request #555 from dirkschulze/fix-geometry-tests

Fix problems with tests.