Bring back test window-2.9. No longer hangs.