updated relations and tests