Fix order of arguments in assertEquals

Part 4

Related to: bug #1277104

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