Adding fix for test context.