Revert "Revert "Dileep | deleting unused test/code""

This reverts commit 571ac4f258f9ac46521a14d2476a2ffe4b071cf7.
Dileep | Fixing unit test
Ajay,Pooja,Dileep | Fixing submission mapping creation issue.