Modify controler rendering and add test