Upgrade junit, resolve guice test exceptions.