Revert "Revert "Finish Test Data generator""

This reverts commit 0acf001e997e4ef38bdefba15667d6bac7d44b86.