Fixed order of Assert.AreEqual statements so that they follow the format of (expected,actual) rather than (actual,expected) as they were previously.