Fix order of expected, actual in some tests