diff --git a/README.md b/README.md
index 260aec860ea53681f1cfb8b93b0ef6f899311cb7..0e37866c8c402e1ae3a5b20a4601202692ec5e58 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ By participating, you are expected to uphold our [Code of Conduct](https://gitla
 request in GitLab and choose this repository as target. Make sure to select
 "Allow commits from members who can merge the target branch" under Contribution
 when creating the merge request. This allows our team to work with you on your request.
-- You can also contact us at **info (AT) caosdb.de**.
+- You can also contact us at **info (AT) caosdb.org**.
 
 ## License
 
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 529a96a81c76e6d2607e1cddcc79024981d3cc56..0000000000000000000000000000000000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pytest]
-markers =
-    local_server: mark a test as requiring a local caosdb server
-    slow: mark a test as slow (execution regularly takes 5s or longer)
diff --git a/tests/test_administration.py b/tests/test_administration.py
index a6f44bae4577789617ee16e69ed53086ebf90ae3..34c0797100068ee7171986d2ace3221c7de92b6c 100644
--- a/tests/test_administration.py
+++ b/tests/test_administration.py
@@ -30,7 +30,7 @@ from caosdb import administration as admin, Info, get_config
 from caosdb.connection.connection import configure_connection, get_connection
 from caosdb.exceptions import (HTTPClientError, HTTPForbiddenError,
                                LoginFailedError, HTTPResourceNotFoundError)
-from pytest import raises
+from pytest import raises, mark
 
 test_role = "test_role"
 test_user = "test_user"
@@ -67,6 +67,10 @@ def teardown_function(function):
         admin._delete_user(name=test_user + "2")
     except Exception as e:
         print(e)
+    try:
+        admin._delete_user(name="first.last")
+    except Exception as e:
+        print(e)
     try:
         admin._delete_role(name=test_role)
     except Exception as e:
@@ -84,6 +88,17 @@ def switch_to_admin_user():
     assert Info().user_info.roles == ["administration"]
 
 
+def test_create_user_with_dot():
+    admin._insert_user(
+        name="first.last",
+        password=test_pw,
+        status="ACTIVE",
+        email=None,
+        entity=None)
+    configure_connection(username="first.last", password=test_pw, password_method="plain")
+    get_connection()._login()
+
+
 def test_get_server_properties():
     props = admin.get_server_properties()
     assert isinstance(props, dict)
diff --git a/tests/test_issues_server.py b/tests/test_issues_server.py
index 393a58d8aeb0140afc71bfdcbcdc2c83464c7b6c..bad61c220507c7cdd5360892471d04a2f6a032c7 100644
--- a/tests/test_issues_server.py
+++ b/tests/test_issues_server.py
@@ -1096,3 +1096,12 @@ def test_177():
     db.Property("TestProp", datatype=db.TEXT).insert()
 
     db.RecordType("TestSubRT").add_property("TestProp").add_parent("TestRT").insert()
+
+
+@pytest.mark.xfail(reason="Fix https://gitlab.com/caosdb/caosdb-server/-/issues/135")
+def test_135():
+    db.RecordType("TestRT1").insert()
+    db.Property("TestProp", datatype=db.LIST("TestRT1")).insert()
+    r1 = db.Record().add_parent("TestRT1").insert()
+    r2 = db.Record().add_parent("TestRT1").add_property("TestProp", r1).insert()
+    assert len(db.execute_query("FIND ENTITY WHICH IS REFERENCED BY A TestRT1 AS TestProp")) == 1
diff --git a/tox.ini b/tox.ini
index 2b326539ffb4c129bbda8705b341148e92960a14..c86b7e505e1cce056b9e20faeba993c1511d8667 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,3 +17,9 @@ commands_pre=pip install ../caosdb-pylib/
     python -c "import caosdb; print(caosdb.version.version)"
 # Add "-x" to stop at first error.
 commands=pytest --cov=caosdb -vv {posargs}
+
+[pytest]
+markers =
+    local_server: mark a test as requiring a local caosdb server
+    slow: mark a test as slow (execution regularly takes 5s or longer)
+xfail_strict = True