More shuffling of tests