Query_Tree..remove() and ..add(), add test for empty queries, fix required, pass