Refactored where tests will be placed.  Started adding the unit tests so I can catch up and continue this project as TDD.