Merge "Fix missing WindowTestBase.tearDown call"