added guice and tests