Use standard singleton annotation
Update AbstractModule.bindMock() to return the mocks.