Fixed package name, add generics test.