MNT: All tests passing with XRF refactor