MAINT: improve readablility of cross and improve test coverage