Update tests and main controller.