Adding some socket based things to test