separated classes
fixed failing tests
added a gemfile