Update for 3.2.0 initial - tests failing with guice errors