Added downcase test and RegEx improvement