M: repairing some tests.