diff --git a/openedx_events/learning/data.py b/openedx_events/learning/data.py
index c3ce73e9..f05d8e28 100644
--- a/openedx_events/learning/data.py
+++ b/openedx_events/learning/data.py
@@ -21,7 +21,7 @@ class UserNonPersonalData:
     """
 
     id = attr.ib(type=int)
-    is_active = attr.ib(type=bool, default=True)
+    is_active = attr.ib(type=bool)
 
 
 @attr.s(frozen=True)
@@ -41,19 +41,18 @@ class UserPersonalData:
 
 
 @attr.s(frozen=True)
-class UserData:
+class UserData(UserNonPersonalData):
     """
     Attributes defined for Open edX user object.
 
+    This class extends UserNonPersonalData to include PII data completing the
+    user object.
+
     Arguments:
-        user_non_pii (UserNonPersonalData): user's Personal Identifiable
-        Information.
-        user_pii (UserPersonalData): user's Non Personal Identifiable
-        Information.
+        pii (UserPersonalData): user's Personal Identifiable Information.
     """
 
-    user_non_pii = attr.ib(type=UserNonPersonalData)
-    user_pii = attr.ib(type=UserPersonalData)
+    pii = attr.ib(type=UserPersonalData)
 
 
 @attr.s(frozen=True)
diff --git a/requirements/test.txt b/requirements/test.txt
index dd9a8007..122123d1 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -20,8 +20,6 @@ django==2.2.24
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
-ddt==1.4.2
-    # via -r requirements/test.in
 edx-opaque-keys[django]==2.2.2
     # via -r requirements/base.txt
 iniconfig==1.1.1