Added a test for SSLHandshakeException and a little cleanup