Refactored SetupTestDataSet