Update testing method, add cov flags

.gitlab-ci.yml

@@ -56,10 +56,5 @@ cython-editable-install-test:
   only: [merge_requests]
   <<: *before_script
   script:
-<<<<<<< HEAD
     - python3 -m pip install -e ".[test]"
     - python3 -m pytest --color yes --verbose ./tests/test_agipdalgs.py
-=======
-    - python3 -m pip install ".[test]"
-    - pytest -vv tests/test_*
->>>>>>> Adjust CI for new setup.py requirements