new macro project, new cml project, and fixed tests