check out p.a.upgrade to try to fix upgrade tests