Changes made in order to easier socket use with addr's, and tests working correctly.