Put back FileTreeController and fix tests