Revert "Revert "with one Test and start MS""

This reverts commit f9768041692b7f78a829f5870ea1e88bedb42e32.
Revert "Revert "Revert "with one Test and start MS"""

This reverts commit a4ff6f4a357ccb3b52ffd09ddff88b25869a5441.