Unit test and controller added