added more testcase for facets + cleanup