Fix for recently added unit tests for empty geometry