fix loading of objects, update map to test