[category-tree-as-default] New category button
[category-tree-as-default] Fixing broken tests