Refactored to add FOSS testing
Merge branch 'FossTestingRefactor' into 1.0.x