Bring `master` up to Hive 0.11 compliance

Few unit test issues we'll address through subsequent PRs.