Refactorings of diagram and unit tests on home controller.