Added more tests, fixed Deals with address information