Removed Marine type.
Commandline --test_conn_and_quit paramter to be used for checking handshake system.