Updated the regexp and added more test cases.