HIVE-7792: Enable tests on Spark branch (2) [Spark Branch]