Refactor testdevice

Authored by sredman on Jun 5 2019, 2:42 AM.