Code clean up and better wiring for tests and roboguice.