- added some unit tests for regression #7086
- removed redundant code and clean up
Merge pull request #7244 from adobe/ingo/fix-7087

Added some unit tests for regression #7086