Migrate rest of main keys and update suite to be more pytest-relaxed compat

Main branch as of today:

350 passed, 21 skipped, 52 deselected, 3 warnings in 11.10s

This branch as of this commit:

361 passed, 21 skipped, 52 deselected, 3 warnings in 10.51s

Of those 11 "new" tests, 8 are ones I wrote (tests/pkey.py). Hard to
figure out what the other 3 are given pytest-relaxed's output is very
different from regular verbose pytest. oops.

1 files changed, 2 insertions, 3 deletions

diff --git a/pytest.ini b/pytest.ini
index 62fef863..209df545 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,5 @@
 [pytest]
-# We use pytest-relaxed just for its utils at the moment, so disable it at the
-# plugin level until we adapt test organization to really use it.
-addopts = -p no:relaxed
+testpaths = tests
+python_files = *
 # Loop on failure
 looponfailroots = tests paramiko