Fixing some source code test failures.
Merge pull request #2827 from waldenraines/source-test-fixes

Fixing some source code test failures.
Merge remote-tracking branch 'upstream/master' into rubocop