Added MsTest to try and replicate long running issue.