Added frienship attributes and tests