Fixed and added some tests
Fix #3952 (closed)
This will create a new commit in order to revert the existing changes.
