S68340 fixing broken unit tests