More refactoring of coupon tests