Minor improvements required for external test dsl

Change-Id: I11fcf17de91a05ac7a6ff975cddce67844db4cae
3 files changed