Improve related objects and add tests