Unit tests MDL-24975 Completion unit tests fix