Moved related link declaration to integrity layer
REF
Fixed unit tests