Checkin code for refactoring broken service tests.  This will resolve
issues with adding Reading Type to the Device