Improve preparation for dividing packages in test_queue