Improve readability introducing hamcrest