Merge "Refactor test to use Guava EqualsTester"