flesh out tests and new filter