Cover more cases for issue 555
Activate specs for issue 555
Merge pull request #109 from xzyfer/feat/improve-issue-555

Improve and activate specs for issue 555