HIVE-4513 - fix test cases, usage in tests
HIVE-4513 - updating comments to address comments