Upstream branch has been merged; update fixtures