Fixed a misbehaving test case
Stop relying on node address for query preparation

Fixes #27