Revamping Gems and adding rspec