For v1 tests, just extended with explicit calls that use keyword arguments. For v2 tests, rewrote pretty much everything to what it 100% explicit what we support
