Merge "Fix session handling in API test cases."