Merge branch 'mjboyarov-develop'
Modified specs/test.rb with new assertions
Merge branch 'eddwin-develop'
Run Rubocop