Updates to fix iframe tests.