Small changes to McMd tests