Added tests
Followed rubocop's advice
Merge branch 'release/1.0.18-2'