Merge pull request #1982 from aparajit-pratap/dynamoCurrent

Reverting test case changes
Debugger, expression interpreter, tests and framework cleanup