Merge RegexMatch into test_cli_env.py