Updating code to meet linting requirements
Two files left to complete test file lint fixes
Cleaned up formatting of subscription tests
Cleaned up formatting of items tests for lint checking