renaming package data2 to data
fixing unit tests