Update object objects to work with improving tests