rejig some tests and rm the parked frame swapping