fixed added new object types
fixed failing tests
fixed tests