Cleaning up and test fix
Socket API tests