Add new Rakefile and add changes from review
Convert tests to rspec