data generator cleanup
Merge pull request #64 from ipeirotis/test_data_generator_cleanup

data generator cleanup