fix send method and update tests