fixes #30
More generics tests