More address fixing and tests