It also seems like allowing some (or all) of these functions should take kwargs, so that when we find stuff like this in the future it doesn't break backwards compatibility. Stuff like setup_test_environment might not, because it's just a basic wrapper, but it seems like a good future-proofing step.