add composite pk test
rename package type to types