OC-8310: Remove breaking test changes