assertEquals is deprecated, use assertEqual

Change-Id: I226d9046d25d681beea60d38b029b71f9e6bf86c
Merge "assertEquals is deprecated, use assertEqual"