Adding in check for Window Test