small fixes for device test