Cleanup - Removing deprecation warnings from specs and removing empty
helper and test files for empty helper files.