Merge "Add new test cases"