move structure type from template parameter inside data_source_type
update test