GEOT-4776: Adding low level tests for heterogeneous case
Merge pull request #479 from geosolutions-it/GEOT-4776-11x

GEOT-4776 backport to 11.x