Code refactor Fix test Fix warning jank Rerunning e2e tests Co-authored-by: Alex Donesky <adonesky@gmail.com> Co-authored-by: Ariella Vu <20778143+digiwand@users.noreply.github.com>