Switch to junit 4.11