Fix the apiTests unit test failures on the rocksdb branch.
Fix the apiTests unit test failures on the rocksdb branch.