test order-stage and report fixes