update Types2; add tests