More test rearranging and shuffling.  wheeeee.