Fix tests to match MCM3