Added some tests and tried solving the send issue