Add testing
Update and simplfy friendship model