Fix order of arguments in assertEquals

Part 5

Related to: bug #1277104

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