Replacing with Hamcrest matchers and asserts, adding assertion messages