Fixed broken tests after previous commits.