Fix shutdown for local node, and revert test changes