Added more testing to bring Server and SocketThread up to date with testing.