Removed redundancy of test-data generation