The dailies timed out as they were running the entire directory of tests due to a wrong variable named being used. In addition, the names of tests were adjusted to include the matrix type so the artifacts won't overwrite each other Change-Id: Iaa1be8e0cfcbf9d64f1a674590bfe2bf1f0dae90