Made this work with window-testing