CLASS: fixed the filter method, added some more filter test