add tests for types and individuals