Some refactoring in tests of test data providers