Update JUnit version to 4.11
Update tests for JUnit4.