And other cleanups/refactoring of unit tests while at it.
And other cleanups/refactoring of unit tests while at it.