Test objects-add rebuild for the new datamodel