Sorry, corrected tests and replaced previous behavior

In doublechecking I realized that you had already fixed this bug, and so my fix was actually not correct here.

Also, the additional tests I added had some problems so I fixed them.  At least now we have improved test coverage by a little bit.