add filter helper and more tests