OPAL-1876 Test fix