Minor clean up
Close clients in test! and in finally blocks!