Updated WindowTester