MODE-650: Fixed broken tests