Improve address test