Further updated UserAddressUtils and tests