Mavenize project and upgrade tests to junit 4.11