More swapped expected/actual

I should have grepped a little bit more thoroughly on the last pull request.  Looked at every assert_equal in the repo this time, I promise.  Sorry!