Fixed DDL. Fixed some test cases.