Added status order and tests