Renaming to datastructure
Temporary disabled unittest