Improves the filter tree options and adapts the tests