Improvements to the tests and the multiReplace string substitution.