Removed unnecessary change
Fixes for CustomData + Added more tests