Updated Controller testcase to highlight bug
Added testcases and fix for bug_64620844