Cleanup of Built-in methods tests
updated test case
Merge pull request #2108 from aparajit-pratap/dynamoCurrent

Cleanup of Built-in methods tests