Add rudimentary test accounting to current tests

Change-Id: I13f787fe25620acf7e0c24d1e395a121c382a752