Revision for propose a pull request to fix #1180

This is the final version of a proposed solution to fix
issues #932, #1104 & #1180. Following last minute changes
have been done:

- Renamed one of the test cases to its original name.
- Shorten son command line strings to improve code styling.
- Fixed minor typos in comments.