Gotcha! I updated both code and test.

I kept the optional `context` parameter though as I think it could still be useful to have an alternative context.

What do you think?