Refactored tests
Added Gemfile