Refactored the two test classes into one
Merge pull request #24 from mlennon3/test-rename

Michael | Tech Debt | Refactored the two test classes into one