Merge "refactor v3 cred tests to work with pre-prov"