Added more test cases based on the regular expressions provided by Alfonso.