Merge "assertEquals is $expected, $actual, not $actual, $expected"