Guice code clean up.

Also added a failing test for @Test(guiceModule).
3 files changed