added test
fix device name
fix tests
fix tests
fix tests
Merge pull request #321 from mimmi20/issue-318

Fixes #318