Beef up benchmark code

Change-Id: I25c0099f4c3ba7a00d5d2b84ec75b1cadd9404a4