A few more edge cases to be test and a fix for an existing test case
This will create a new commit in order to revert the existing changes.
