Finish Test Data generator
Revert "Finish Test Data generator"

This reverts commit fc029253e492675f867a88087e363dcf4f02128a.