Make sure we close the client when the test is complete.

These tests do need some attention.  The close() should be in a finally
block for those cases where a test fails, or a test is expecting a failure
and is allowing the error to be handled by TestNG.