Added mapping + unit test

Added Issue mapping
Added unit test