Some additonal modifications:
* provider from testgen needs explicit setup at least for now.
* some typos fixed.