Issue 493

I changed the device type and added some tests. This should solve Issue #493.