Test data preparation modified

	Test data is now prepared based on features applied
	to the windows