Began Adding Testing
Refactored some classes  because of parameterization issues.