Merge "Fix Upstream test cases to be case insensitive"