Fixes #390 - Fix test name counters