Removed AddressTrait in favour of AddressFactory and implementations of AddressInterface.
Updated existing tests to work with AddressFactory, still need to write additional tests.