Added should to Then functions and corrected ordering regular expression.