Clean up FunctionEquivalenceTest. remove use of tuple in favor of struct. Change-Id: If3b1aa5c2fc3cfe1446fff7a8fd270f2ca85fedf