Working DataPreparator and DataPreparatorTests