fix for BufferedGeoMergerUnitTests
adding cfs indexing and merge tests to cover the cases where .geo is pulled into the .cfs file