Yeah this is a hack to force the right context for now. We need to refactor the tests so we can better deal with this situation (#742).