EC2 classic mode unit tests for addresses

Change-Id: Id9ccac0869555fb2ea977a9e878d41386550f336
Merge "EC2 classic mode unit tests for addresses"