Reverted to MSTests
Fixing tests