Revert "re-enum test device "

This reverts commit 92946c92cda45061c3ae115ca934f1f56a79eed1.