Simplify usage of patch_argv fixture.
This moves the fixture to conftest and adds it as an argument
Version tests are still broken but this cleanup is required.
Also some whitespace fix.