Fix remove code in HashBTree storage, based on bug identifed by Kaben Nanlohy. Added regression tests that cover it.