Updated tests.  2 BaseGuiceServletInjector tests fail when run under
Gradle, though are OK when run directly from JUnit.  Other failing tests
are incomplete