Plumb in the context variable, update tests.