Added user frienships and associated tests