Added underlying unit test cases and improved controller class
commenting