Update tests, regex, and parser