facets, config and unit tests fixes