switch to more general matchers in hamcrest