Fix discovery interface: use hash_ because hash is a built-in.
Try to fix testing layer mess.