More test helpers

Change-Id: I14cac77cfe577330bc5dbe760ac6d51b54517a72