Fix upgrade step after rebase.
Adapt new tests for fixture setup after rebase.