Be a little bit more orderly about clients and nodes

Try to close the client connection on each test to not have stale connections.