Add user following
Minor tweaks to fix rspec spec tests