Clean up with Hamcrest