Refactored datamodel and included test data. TU