This can be enforced by pre-commit, but correct it separately to make it easier to review.
From now on, all new tests must use underscore. Addresses issue #727.