Merge branch 'feature/test-plugin-conflict-error'

Conflicts:
	tests/unit/cmdline/test_tests.py