Improvements on tests and added handshake + message queue