Changing around DataPreparator arguments to be more testing friendly. Now passes all supplied tests