move handshake test to tier2