Minor test refactoring
Added guice dependency in pom