Fixes #8119 - Remove tests covered by rubocop
Merge pull request #4770 from daviddavis/temp/20141027120251

Fixes #8119 - Remove tests covered by rubocop