Fix test cases RE-NFA and new test cases added