Fix some window tests