More collections, types, and tests.