Upstream test project for rebasing