3rd part: changed type names of "object"-structs (in tests)