Added hamcrest etc