Bug 20837: (RM follow-up) fix test count