Merge "Clean up FunctionEquivalenceTest." into nextgenv2