updated to JUnit 4.11 and hamcrest 1.3