Since Pytest 4, we can't call fixtures as if they were functions. This change removes the parameters from the fixtures (since we can't use them), except for when the parameter is another fixture.