SimpleTest updated to work correctly in Windows.y