Merge "Add additional mocking for Context innards"