Fix M/R tests