in-iframe tests and some cleanup