Regex on keys: completed tests.
Minor bugfix in testsuite.