Do the rubocop and debug in test file
Merge branch 'lee' into develop