tests

Added tests
Fix an issue with geometry field case