Classes made more generic. Added test for device discovery.