fix Objectid is removed now
test fixes