diff --git a/Makefile b/Makefile
index 524175c..edb9b97 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 # Makefile driver for SWH Python modules. DO NOT CHANGE.
 # You can add custom Makefile rules to Makefile.local
 
-include ../Makefile.python
 -include Makefile.local
diff --git a/Makefile.local b/Makefile.local
new file mode 100644
index 0000000..dd82804
--- /dev/null
+++ b/Makefile.local
@@ -0,0 +1,3 @@
+.PHONY: run-dev
+run-dev:
+	docker-compose up
diff --git a/swh/graphql/schema/schema.graphql b/swh/graphql/schema/schema.graphql
index abb6c2b..2fe7f86 100644
--- a/swh/graphql/schema/schema.graphql
+++ b/swh/graphql/schema/schema.graphql
@@ -1,12 +1,12 @@
-type Query {
-  origin(url: String!): Origin
-}
-
 type Origin {
   url: String!
   visits: [Visit]!
 }
 
 type Visit {
   status: String
 }
+
+type Query {
+  origin(url: String!): Origin
+}
diff --git a/swh/graphql/tests/backends/test_archive.py b/swh/graphql/tests/backends/test_archive.py
index c6083cd..fc48677 100644
--- a/swh/graphql/tests/backends/test_archive.py
+++ b/swh/graphql/tests/backends/test_archive.py
@@ -1,5 +1,5 @@
 from swh.graphql.backends import archive
 
 
 def test_get_origin():
-    assert archive.get_origin() == {"url": "example.com"}
+    assert isinstance(archive.get_origins(), list)
diff --git a/tox.ini b/tox.ini
index 265ed6c..58960a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,72 +1,72 @@
 [tox]
 envlist=black,flake8,mypy,py3
 
 [testenv]
 extras =
   testing
 deps =
   pytest-cov
 commands =
   pytest {envsitepackagesdir}/swh/graphql \
          --cov={envsitepackagesdir}/swh/graphql \
          --cov-branch {posargs}
 
 [testenv:black]
 skip_install = true
 deps =
   black==19.10b0
 commands =
   {envpython} -m black --check swh
 
 [testenv:flake8]
 skip_install = true
 deps =
   flake8
 commands =
   {envpython} -m flake8
 
 [testenv:mypy]
 extras =
   testing
 deps =
   mypy==0.920
 commands =
   mypy swh
 
-# build documentation outside swh-environment using the current
-# git HEAD of swh-docs, is executed on CI for each diff to prevent
-# breaking doc build
-[testenv:sphinx]
-whitelist_externals = make
-usedevelop = true
-extras =
-  testing
-deps =
-  # fetch and install swh-docs in develop mode
-  -e git+https://forge.softwareheritage.org/source/swh-docs#egg=swh.docs
+# # build documentation outside swh-environment using the current
+# # git HEAD of swh-docs, is executed on CI for each diff to prevent
+# # breaking doc build
+# [testenv:sphinx]
+# whitelist_externals = make
+# usedevelop = true
+# extras =
+#   testing
+# deps =
+#   # fetch and install swh-docs in develop mode
+#   -e git+https://forge.softwareheritage.org/source/swh-docs#egg=swh.docs
 
-setenv =
-  SWH_PACKAGE_DOC_TOX_BUILD = 1
-  # turn warnings into errors
-  SPHINXOPTS = -W
-commands =
-  make -I ../.tox/sphinx/src/swh-docs/swh/ -C docs
+# setenv =
+#   SWH_PACKAGE_DOC_TOX_BUILD = 1
+#   # turn warnings into errors
+#   SPHINXOPTS = -W
+# commands =
+#   make -I ../.tox/sphinx/src/swh-docs/swh/ -C docs
 
 
-# build documentation only inside swh-environment using local state
-# of swh-docs package
-[testenv:sphinx-dev]
-whitelist_externals = make
-usedevelop = true
-extras =
-  testing
-deps =
-  # install swh-docs in develop mode
-  -e ../swh-docs
+# # build documentation only inside swh-environment using local state
+# # of swh-docs package
+# [testenv:sphinx-dev]
+# whitelist_externals = make
+# usedevelop = true
+# extras =
+#   testing
+# deps =
+#   # install swh-docs in develop mode
+#   -e ../swh-docs
 
-setenv =
-  SWH_PACKAGE_DOC_TOX_BUILD = 1
-  # turn warnings into errors
-  SPHINXOPTS = -W
-commands =
-  make -I ../.tox/sphinx-dev/src/swh-docs/swh/ -C docs
+# setenv =
+#   SWH_PACKAGE_DOC_TOX_BUILD = 1
+#   # turn warnings into errors
+#   SPHINXOPTS = -W
+# commands =
+#   make -I ../.tox/sphinx-dev/src/swh-docs/swh/ -C docs