3 test systems are more interesting than 1

Change-Id: Ibd9ccdc786621efe7ca89dd80a3edfa732f2785a
Merge "3 test systems are more interesting than 1"