Fix order of arguments in assertEquals

Part 3

Related to: bug #1277104

Change-Id: Ia31f8f90b4b5f8edfa04091cc7e987c7e1f24383
Merge "Fix order of arguments in assertEquals"