Refactoring to Hamcrest matchers in Tests