Fix #122.  Tests had fallen behind some of the improvements made.