Also fix incorrect order of some other assertions Change-Id: Idf50f98de7a17311ea8db6f2cae3b101f4c1da89