Fix CleanedData
Refactoring unit tests
Refactoring unit tests
Refactoring unit tests
Refact