Upgrade Guice and JUnit
Refactor Guice injectors