Fixed more issues with DDL Generation and Test Cases
Resolved a few more tests.