fixing test and controller. not done yet