Regex fixed and testing