Specify test group explicitly

Change-Id: I53b963070dc0df0a9b3dc1bd385cee5c4cc7ca99
Merge "Specify test group explicitly"