Reflow error text
Catch up test suite

The test suite was a little behind recent changes:

 - automatic dereferencing
 - Python 3 exception assignment (only defined in the block)
Rename one_or_zero to one; #20