Added tests for address2.
Added some tests to AddressTest.
Merge branch 'HOTFIX_ADDRESS2_01'