Correct assertEqual order from patch e69e41c99fb

This is a follow-on patch to correct the param order
in assertEqual statements in e69e41c99fb.

Change-Id: I4b910070403cd08a30cb31bd2665dc915625a773
Merge "Correct assertEqual order from patch e69e41c99fb"