fix mm3 tests, cosmetics