clean up some of my new tests; add definition of IndependentPaymentStrategy