Improves the filter tree options and adapts the tests
Merge pull request #77 from nsendetzky/master

Improves the filter tree options and adapts the tests