Separate Macros and refactor Lens test