Test fixes, giving up on iframes-in-iframes for now