These tests excercise cases that are fixed by the previous two commits.
From now on, all new tests must use underscore. Addresses issue #727.