CDK-666: Fix for sporadic Hive test failures

Closes #206