test: working with upstream change to subtree