Fix order of expected, actual in some tests

Change-Id: Iabd431517586c06d411a0894e5d3621a4c4ddf05
Merge "Fix order of expected, actual in some tests"