up
Merge pull request #4 from gyman/feature/testingCleanup

up