diff --git a/pybis/src/python/tests/test_dataset.py b/pybis/src/python/tests/test_dataset.py
index d16f711d57c32bcc7b6b785862ba1487ab78ab27..1d94200901e83c7c2066a8899125f31e9ee9961d 100644
--- a/pybis/src/python/tests/test_dataset.py
+++ b/pybis/src/python/tests/test_dataset.py
@@ -8,7 +8,7 @@ import time
 
 def test_get_datasets(space):
     # test paging
-    o=space.openbis
+    o = space.openbis
     current_datasets = o.get_datasets(start_with=1, count=1)
     assert current_datasets is not None
     # we cannot assert == 1, because search is delayed due to lucene search...
@@ -16,21 +16,21 @@ def test_get_datasets(space):
 
 
 def test_create_delete_dataset(space):
-    timestamp = time.strftime('%a_%y%m%d_%H%M%S').upper()
-    o=space.openbis
+    timestamp = time.strftime("%a_%y%m%d_%H%M%S").upper()
+    o = space.openbis
 
     dataset = o.new_dataset(
-        type   = 'RAW_DATA',
-        sample = '/DEFAULT/DEFAULT/DEFAULT',
-        files  = ['testfile'],
-        props  = {'name': 'some good name', 'notes': 'my notes' }
+        type="RAW_DATA",
+        sample="/DEFAULT/DEFAULT/DEFAULT",
+        files=["testfile"],
+        props={"$name": "some good name", "notes": "my notes"},
     )
-    
+
     assert dataset is not None
-    assert dataset.permId is None  # object is not saved
+    assert not dataset.permId
     assert dataset.p is not None
-    assert dataset.p.name == 'some good name'
-    assert dataset.p.notes == 'my notes'
+    assert dataset.p["$name"] == "some good name"
+    assert dataset.p.notes == "my notes"
 
     with pytest.raises(Exception):
         dataset.non_existing_attribute = "invalid attribute"
@@ -39,7 +39,7 @@ def test_create_delete_dataset(space):
     with pytest.raises(Exception):
         dataset.p.non_existing_property = "invalid propery"
         assert "property does not exist, should fail" is None
-    
+
     dataset.save()
 
     # now there should appear a permId in our object
@@ -51,24 +51,30 @@ def test_create_delete_dataset(space):
     assert dataset_by_permId is not None
     assert dataset_by_permId.permId == permId
     assert dataset_by_permId.type is not None
-    assert dataset_by_permId.type.code == 'RAW_DATA'
-    assert dataset_by_permId.kind == 'PHYSICAL'
+    assert dataset_by_permId.type.code == "RAW_DATA"
+    assert dataset_by_permId.kind == "PHYSICAL"
     assert dataset_by_permId.sample is not None
-    assert dataset_by_permId.sample.code == 'DEFAULT'
+    assert dataset_by_permId.sample.code == "DEFAULT"
     assert dataset_by_permId.experiment is not None
-    assert dataset_by_permId.experiment.code == 'DEFAULT'
+    assert dataset_by_permId.experiment.code == "DEFAULT"
 
     assert dataset_by_permId.p is not None
-    assert dataset_by_permId.p.name == 'some good name'
-    assert dataset_by_permId.p.notes == 'my notes'
+    assert dataset_by_permId.p["$name"] == "some good name"
+    assert dataset_by_permId.p.notes == "my notes"
 
     assert dataset_by_permId.registrator is not None
     assert dataset_by_permId.registrationDate is not None
-    # check date format: 2019-03-22 11:36:40 
-    assert re.search('^\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}$', dataset_by_permId.registrationDate) is not None
+    # check date format: 2019-03-22 11:36:40
+    assert (
+        re.search(
+            r"^\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}$",
+            dataset_by_permId.registrationDate,
+        )
+        is not None
+    )
 
     # delete datasets
-    dataset.delete('dataset creation test on '+timestamp)
+    dataset.delete("dataset creation test on " + timestamp)
 
     # get by permId should now throw an error
     with pytest.raises(Exception):
@@ -76,25 +82,24 @@ def test_create_delete_dataset(space):
 
 
 def test_create_dataset_with_code(space):
-    timestamp = time.strftime('%a_%y%m%d_%H%M%S').upper()
-    o=space.openbis
+    timestamp = time.strftime("%a_%y%m%d_%H%M%S").upper()
+    o = space.openbis
 
     dataset = o.new_dataset(
-        type       = 'UNKNOWN',
-        code       = timestamp,
-        experiment = '/DEFAULT/DEFAULT/DEFAULT', 
-        sample     = '/DEFAULT/DEFAULT/DEFAULT',
-        kind       = 'CONTAINER'
+        type="UNKNOWN",
+        code=timestamp,
+        experiment="/DEFAULT/DEFAULT/DEFAULT",
+        sample="/DEFAULT/DEFAULT/DEFAULT",
+        kind="CONTAINER",
     )
-    
+
     assert dataset is not None
-    assert dataset.permId is None  # object is not saved
+    assert not dataset.permId
     assert dataset.code == timestamp
     dataset.save()
 
     # our permId is now identical to the code we provided
-    assert dataset.permId is not None 
+    assert dataset.permId is not None
     assert dataset.permId == timestamp
 
-    dataset.delete('dataset creation test on {}'.format(timestamp))
-
+    dataset.delete("dataset creation test on {}".format(timestamp))