Fix removal return from event emitter
Map created objects to saved objects with ID
Test and fix resolution functions