Re-organize test to use main node-query method