Cleanup - Cleaning up deprecation warnings and inaccurate error messages
appearing in minitests.
Cleanup - Removing deprecation warnings from specs and removing empty
helper and test files for empty helper files.
Merge pull request #2021 from ehelms/deprecation-warning-cleanup

Cleanup - Deprecation warning and test output cleanup.