Added shoulda to test group
Add user friendships and associated tests + re Baseline