add tests and a filter