Converting some Blink tests over & tightening upgrade logic