#283 more generics to get test working - maybe ...