add a link to original filter function
Reorganize test structure