written test for all controller
resolved merge conflit in tests|Neha