CORE-5498: Corrected broken unit tests