Merge "Merge WindowTestUtils into base class"