Fixing some likes issues, also updating rspec test for follow/unfollow functionality
Fixing merge