Modify for address fixed
tests fixed using address and client