Fix order related expectation failure