Allow multiple instances of test program to run

Change-Id: Ie547b4e3a96bd86c0113fff934c540e4958f9045
Merge "Allow multiple instances of test program to run"