Generalized PQ key to a function on the Node object, and improved testing code.