new tests added for double mapping and commented out, because they are failing for issues #598 and #595
Merge pull request #607 from georgebyelas/master

new tests added for double mapping and commented out, because they are failing; issues #598 and #595