adding a test case for the controller
Merge remote-tracking branch 'origin/master'
adding a test case for the controller