Corrected a wrong method name.
Completed Handshake* (more tests, javadoc, cleanup).