Minor Updates to TestBase and Window