Changing way to create test data (only started)