Fixes to data creation script
Fixed tests