modifications in the tests and controller.