MAINT: improve readablility of cross and improve test coverage
Merge pull request #4786 from juliantaylor/cross-style

MAINT: improve readablility of cross and improve test coverage