Fixed unit tests (broken when \\marl was taken down)