PLINK-130 built-in identity types moved to "sample" subpackage, extend complex identity model for testing