Regex again and add more tests