Replacing with Hamcrest matchers