Moved provided context variable methods to the interface and fixed unit test.