HIVE-7068 Get the unit tests running again