Fixing broken tests

There were a few cases where the code and the tests were in conflict.  Generally I resolved in favor of the code (i.e. change the tests to match the code).