WIP on new_device and device_test
WIP on new_device and device_test