updates to DeviceTest from recent win changes