Added regular expressions and more validation testing