Imporve address test