Fixed ordering tests