refactoring
Merge branch 'newDesign' of https://github.com/mgable/ms-tests into newDesign