Add some unit tests for #474.  The unit tests are commented out because
they currently fail.