Update DeviceClass and tests.
Update Device tests