SHDP-184 Fixing Hive tests