fixed generics to pass unit-tests
Merge pull request #1277 from karlnapf/develop

fixed generics to pass unit-tests