Refactoring. Using Hamcrest.