Rework packet sending

Rework packet sending to ease testing process