Machine ID for user/sentry & cleanups (#1928)

* Machine ID for user/sentry & cleanups

* Add tests / fix users

tests/conftest.py

@@ -1,5 +1,6 @@
 """Common test functions."""
 from unittest.mock import MagicMock, PropertyMock, patch
+from uuid import uuid4
 
 import pytest
 
@@ -39,6 +40,9 @@ async def coresys(loop, docker):
     coresys_obj.ingress.save_data = MagicMock()
     coresys_obj.arch._default_arch = "amd64"
 
+    coresys_obj._machine = "qemux86-64"
+    coresys_obj._machine_id = uuid4()
+
     yield coresys_obj