o Minor bugfixes in tests.
o Added macros.make files specific to m1