Removed Type field, added test for merchant call