More unit test updates from regex-updates branch