Fixes minor issue
Adds some tests for new FindDevice function