Reorder tests