Added new test cases and regexes