tried to refactor hitting count while working on #337 test, now something is broken