tiny fixes to merchant and customer tests