Import tests cleanup
Merge pull request #2008 from aparajit-pratap/dynamoCurrent

Import tests cleanup