Add rspec and user tests