Fixing broken instrumentation tests when run from command line

Change-Id: I923cdbaaaf18c9b765d1e70122b92cd2c1621e06
7 files changed