Added test data dumping
Refactored the service data generation once
Second refactoring of service data generation.