fixed test errors, added regular expression support