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
Merge pull request #619 from seandst/collection-badness

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