upgrade to junit 4.11 and Hamcrest 1.3