fix filters, add tests