make test tooling less opinionated

Change-Id: I709afcec998795794a9ef13bbe7493ddd46c59b5
Merge "make test tooling less opinionated"