Fixed ordering in model tests