fixup: add test and handle persona upgrade screen