Continued fixes related to hash db rework testing