Began Adding Testing
Refactored some classes  because of parameterization issues.
(cherry picked from commit 392c0c7)
(cherry picked from commit d435f2f)
Merged Code from Home with Work.
All Tests Pass