Add counters and test name indicators