CDK-666: Fix for sporadic Hive test failures

Closes #206
CDK-665: Add deprecated SPI URIBuilder.