More window-removals as they make tests unstable

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>