Real Device Testing updates
Merge pull request #749 from umaar/test-device

Real Device Testing updates