EAGLESIX-2653 changed Regex match expression to use XRegExp and added test cases