Fix for #676 Free of hamcrest CoreMatchers