update hamcrest and rewrite test for filter()