upstream: change to fix-tests branches for now