Get stored window size to actually restore the right size

I also deleted some obsolete code and removed some
redundant qualifiers. Unfortunately I was not able to get
two of the tests to work on Linux. One was previously
ignored on Linux, now my new test is too.

Change-Id: I83957573e58b0de43955ff230d1771ac35272f55