Added some test cases
Removed heap()
abstracted
Added handshaker_send