[AE-922] Fix test case dependencies, and hive 0.13.1 patch to corporate into build process.