Added extensions for multiple grouping and grouping characters.
Fixed test that may fail when executed in parallel.