Update cap_msmf.cpp

Regression test fixes and simplifications