More TDD action for window handler