Switch pytest import style.
Use parametrize instead of fixtures in tests.
Catch SystemExit instead of mocking sys.exit().
Merge branch 'master' into python3