Update validation regexes and update tests