Fix filter test and join test