Merge changes from topic "mappingz"

* changes:
  Sprinkle in some TEST_MAPPING.
  Fix subtle bug when using empty withValues().