all tests should now pass.  I also made this change above and squashed it.