#4137 adding more tests
#4137 simplifying value facet handling