Making Hive tests more stable

@markhamstra