test suite modified so it will pass with the new changes of the last two commits.  Fixes #4150