[DF-4524] Restore deviceinfo test after merge. Fix review comments