cleaned out non socket related stuff.
renamed Fake... to Test...
added OneShot