Updated test script
Updated Service class
Updated Address class