More refinements and test code for new Hash Adapter support