Merge "Fix testCursorIsOnRight test case"