Fix a bug in HashBTree::Remove triggered by typos in two if statements.  Added a (convoluted) test case that triggered the problem.