Fix tests for benchmarking system.

Change-Id: Ifd8fb3738e3a528f5135189017cfab39193d3418
5 files changed