More Code changes for billing test