The code previously assumed that only functions can be closed over.
From now on, all new tests must use underscore. Addresses issue #727.