Add rspec and played with helper functions