Fix tests to account for the modification to the user message origin regex