Core tests - missing changes after class rename