add tests for macro primitives with rotation
fix up test files