Assigning a default context argument  actually creates a global, which I don't think was the intended effect.  More discussion and a better explanation of this can be found at http://bit.ly/1iw46

change it to a single function. Also update the
tests