Fix Regexp + tests.