Merge "Add clatd test definitions to the testrunner."