Add new facet and rename an existing one
Add new facet value to test
Merge remote-tracking branch 'origin/add-facet-values'