FacetDictionary and FacetTest added