Bug 937336 - Remove where possible explicit frame switching

Change to Persona test