Adding Data files.
Adjust tests and code.