Fixed broken tests after rename