The aim here is to improve coverage of the code.
From now on, all new tests must use underscore. Addresses issue #727.