Tweak unit test regex some more.