mfmtest runs cleanly
Merge from earlier pull request