Added shoulda. Then added user friendships & tests