Add tests for manual changes of the model

Additional tests to account for user deleting a guest device.  

Fixes ZEN-11772