Test collection fixed for tests that don't need to be parametrized

- Also no longer using pytest.skip to prevent fixturesplodes, welcome the new and slightly silly uncollect mark