rearrange priv/lock tests independent of node type