Remove pending statements from helper methods - cleaning up a bit.
Initial fix for stripe-mock setup.  Works now but needs additional tweaking