Refactored the test factory windows
Merge branch 'master' of https://github.com/otudor/WSTester.git