Added a couple of tests re affiliateId.