Add test, bugfix for defaultData support