More refactoring
Merge branch 'master' of github.com:JimbowsNET/SoftwareTesting_V6