Some fixes to Toroidal and Extrusion surface.

[GabrielJMS]

• Please check if the PR fulfills these requirements

• [x] The commit messages follows our guidelines (explicit, in english)

• [x] Tests for the changes have been added (for bug fixes / features)

• [ ] Docs have been added / updated (for bug fixes / features)

• [x] CHANGELOG.md has been updated

• What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

• [x] Bug fix:

• [ ] New features:

• [ ] Documentation

• [ ] Optimization

• Other information: