Put UDPServer back, added more test code