adding tests
fixing rubocop errors
Merge pull request #1 from jereln/dev

Dev