updates for unit tests
Removing raw UDP
removed debug printfs