#523: add new tests, change device type