Updated tests to confirm with changes made to cmp_tree and filter_test.