DataFilter changes, clustering filter testing framework