Regex fixes in tests