Rather ugly patch to let caller supply the magic hash name test