Clean up
Introduce Guice
Rename test class