Rewrite test order when using reports