diff --git a/tests/test_issues_server.py b/tests/test_issues_server.py
index af88e7440e4f7704d4569d167170d71bb354db9d..3afb0474ff52233c07ee76089b5811d58c35a964 100644
--- a/tests/test_issues_server.py
+++ b/tests/test_issues_server.py
@@ -472,7 +472,6 @@ def test_issue_183():
                                       "(yyyy-mm-dd'T'hh:mm:ss[.fffffffff][TimeZone]).")
 
 
-@pytest.mark.xfail(reason="fix https://gitlab.com/caosdb/caosdb-server/-/issues/130")
 def test_issue_130():
     """Test select queries where names contain spaces
 
@@ -506,7 +505,7 @@ def test_issue_130():
 
     query = "SELECT 'TestWrapper' FROM RECORD TestRT_B"
     row = db.execute_query(query).get_property_values(("TestWrapper", "id"))
-    assert row == [(r1.id,)]  # FAILS
+    assert row == [(p1.id,)]
 
     query = "SELECT TestWrapper FROM RECORD TestRT_B"
     row = db.execute_query(query).get_property_values(("TestWrapper", "name"))
@@ -517,12 +516,12 @@ def test_issue_130():
     assert row == [("ReferencedRecord",)]
 
     query = "SELECT 'TestWrapper.name' FROM RECORD TestRT_B"
-    row = db.execute_query(query).get_property_values(("TestWrapper", "name"))
-    assert row == [("ReferencedRecord",)]  # FAILS
+    rec = db.execute_query(query, unique=True)
+    assert len(rec.properties) == 0
 
     query = "SELECT 'TestWrapper'.name FROM RECORD TestRT_B"
     row = db.execute_query(query).get_property_values(("TestWrapper", "name"))
-    assert row == [("ReferencedRecord",)]  # FAILS
+    assert row == [("ReferencedRecord",)]
 
     query = "SELECT TestWrapper With Spaces FROM RECORD TestRT_B"
     row = db.execute_query(query).get_property_values(
@@ -542,23 +541,17 @@ def test_issue_130():
     query = 'SELECT "TestWrapper With Spaces" FROM RECORD TestRT_B'
     row = db.execute_query(query).get_property_values(
         ("TestWrapper With Spaces", "name"))
-    assert row == [("ReferencedRecord",)]  # FAILS
+    assert row == [("TestWrapper With Spaces",)]
 
     query = 'SELECT TestWrapper With Spaces.name FROM RECORD TestRT_B'
     row = db.execute_query(query).get_property_values(
         ("TestWrapper With Spaces", "name"))
-    # Works!!! This is about the quotation marks
     assert row == [("ReferencedRecord",)]
 
-    query = 'SELECT "TestWrapper With Spaces.name" FROM RECORD TestRT_B'
-    row = db.execute_query(query).get_property_values(
-        ("TestWrapper With Spaces", "name"))
-    assert row == [("ReferencedRecord",)]  # FAILS
-
     query = 'SELECT "TestWrapper With Spaces".name FROM RECORD TestRT_B'
     row = db.execute_query(query).get_property_values(
         ("TestWrapper With Spaces", "name"))
-    assert row == [("ReferencedRecord",)]  # FAILS
+    assert row == [("ReferencedRecord",)]
 
 
 def test_issue_132():