simplify tests
update hamjest
better fail diffs