Get AR 2.3 tests passing again

This PR gets the AR 2.3 tests passing again.