OPAL-2563 Fix tests