Enhanced statement regex.
Minor alteration to tests.