Fixes to the tests and added ddl