Fix tests, faceting should work [MJ-902]