add related objects and tests