Merge "Add --cdex-fast and --cdex-none variant to testrunner"