Added reportServiceBuilder and fixed some ControllerTests