Updated tests for devices