Replaced getInstance methods with field for instances of ITestDataProvider. Some simplification in hierarchy of related tests.