--- a/server/python/django2/renkanmanager/tests/v1_0/tests_workspace.py	Wed Jun 15 16:31:43 2016 +0200
+++ b/server/python/django2/renkanmanager/tests/v1_0/tests_workspace.py	Mon Jun 20 14:44:40 2016 +0200
@@ -114,8 +114,17 @@
 
         get_url = reverse("v1.0:workspace_detail", kwargs={"workspace_guid": "bleh-bad-workspace-id"})
         get_response = self.client.get(get_url, format="json")
+        self.assertEqual(get_response.status_code, status.HTTP_400_BAD_REQUEST)
+
+        ###################################################
+        # GETting wrong workspace_guid
+        ###################################################
+
+        get_url = reverse("v1.0:workspace_detail", kwargs={"workspace_guid": "00000000-0000-0000-0000-000000000000"})
+        get_response = self.client.get(get_url, format="json")
         self.assertEqual(get_response.status_code, status.HTTP_404_NOT_FOUND)
 
+
     def test_update_workspace(self):
 
         ###################################################
@@ -206,4 +215,13 @@
 
         delete_url = reverse("v1.0:workspace_detail", kwargs={"workspace_guid": "bad-workspace-guid"})
         delete_response = self.client.delete(delete_url, format=json)
+        self.assertEqual(delete_response.status_code, status.HTTP_400_BAD_REQUEST)
+
+
+        ###################################################
+        # Try to DELETE workspace with wrong guid
+        ###################################################
+
+        delete_url = reverse("v1.0:workspace_detail", kwargs={"workspace_guid": "00000000-0000-0000-0000-000000000000"})
+        delete_response = self.client.delete(delete_url, format=json)
         self.assertEqual(delete_response.status_code, status.HTTP_404_NOT_FOUND)