Testing after refactoring, issue with UDP