MUS-34 fix test errors