more improvements in data package, more tests