Fixed the ddt tests as per the PR comments