added shoulda
 added user friendships and tests