[TEST][CLEANUP] - Refactored to split out related functionality into more cohesive classes, added unit tests, checkstyles
Merge pull request #1 from brosander/cleanup

[TEST][CLEANUP] - Refactored to split out related functionality into mor...