Fix and test validation regex