Updated regex and test