Fix tests; remove Hamcrest matchers bkz they give zero context info about what assertion failed