Ensure clients are finally closed, fix #239

Please tell me tests haven't changed in master and that I can override them...