Adding selected send; improving tests