Fixed test broken by implicit conjunction
Added regular expression support