Making Hive tests more stable