More extensive testing for OC-11422