Minor fixes in merge

Remove references to physical_devices library
Fix UT for test_kstate, test_vn_uve and test_stats_mock