Merge branch 'gem'
refactor to increase test coverage
Merge branch 'master' into songs to update gemfile
refactor tests to improve coverage