Removed stress tests that should not be part of the build
Resolved conflicts when guice modules are integrated