Improved the readability of some unit tests by improving the hamcrest matchers