Added simple facet handler and tests