Port tests to new regex code, ensure they pass