Change tests to use changes in HIVE-3987