add explicit data type to distinguish internal data id
remove test code
Merge pull request #1046 from marcel-blonk/BRIDGE-68

add explicit data type to distinguish internal data id