Cleaned up some errors
Adding TCP server
Test cleanup