More dependencies reconciled after switch to hive_test 4.2.0