Small fixes
Removed MS Test