relationship test adding and cleaning of classes, added ot
fixed merge