Some more touching up of the replaceWith tests.