Updated the tests of prd and repos to ddt & single org