Upstream test fixes